Fix configuring with CMake version 4

Origin: upstream, https://github.com/opencv/opencv/commit/cb8030809e0278d02fa335cc1f5ec7c3c17548e0
Bug-Debian: https://bugs.debian.org/1113355
Last-Update: 2025-04-02

Gbp-Pq: Name cmake-4.patch

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f5e39b4c71bef5ba380e8762994cb2fdc398ba49..5ca6f7fe9a1d1f38fc4d43de334d2e87ddfdd6a3 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,7 +16,7 @@ endif()
 include(cmake/OpenCVMinDepVersions.cmake)
 
 if(CMAKE_SYSTEM_NAME MATCHES WindowsPhone OR CMAKE_SYSTEM_NAME MATCHES WindowsStore)
-  cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+  cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
   #Required to resolve linker error issues due to incompatibility with CMake v3.0+ policies.
   #CMake fails to find _fseeko() which leads to subsequent linker error.
   #See details here: http://www.cmake.org/Wiki/CMake/Policies

diff --git a/cmake/OpenCVGenPkgconfig.cmake b/cmake/OpenCVGenPkgconfig.cmake
index 4fc80f5e4b276d49fe32015cdae4e27b8ab37afb..3532260efb53f29358963db6622bb62384c4ebbb 100644 (file)
--- a/cmake/OpenCVGenPkgconfig.cmake
+++ b/cmake/OpenCVGenPkgconfig.cmake
@@ -110,7 +110,7 @@ endif()
 # =============================================================================
 else() # DEFINED CMAKE_HELPER_SCRIPT
 
-cmake_minimum_required(VERSION 2.8.12.2)
+cmake_minimum_required(VERSION 3.5)
 cmake_policy(SET CMP0012 NEW)
 include("${CMAKE_HELPER_SCRIPT}")
 include("${OpenCV_SOURCE_DIR}/cmake/OpenCVUtils.cmake")

diff --git a/doc/tutorials/introduction/linux_gcc_cmake/linux_gcc_cmake.markdown b/doc/tutorials/introduction/linux_gcc_cmake/linux_gcc_cmake.markdown
index d08280db64fd0d90e48a856c7420f6a0f8615f15..01d2d69a012c42b5c8c4eaacc4067779f760e38e 100644 (file)
--- a/doc/tutorials/introduction/linux_gcc_cmake/linux_gcc_cmake.markdown
+++ b/doc/tutorials/introduction/linux_gcc_cmake/linux_gcc_cmake.markdown
@@ -61,7 +61,7 @@ int main(int argc, char** argv )
 
 Now you have to create your CMakeLists.txt file. It should look like this:
 @code{.cmake}
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.5)
 project( DisplayImage )
 find_package( OpenCV REQUIRED )
 include_directories( ${OpenCV_INCLUDE_DIRS} )

diff --git a/modules/python/CMakeLists.txt b/modules/python/CMakeLists.txt
index 93eab8c94d215f10fea20ed52f61a80f8bed281c..ec30f421501207dcae8a15bd2fefacb2be5416d4 100644 (file)
--- a/modules/python/CMakeLists.txt
+++ b/modules/python/CMakeLists.txt
@@ -35,7 +35,7 @@ add_subdirectory(python3)
 
 else()  # standalone build
 
-cmake_minimum_required(VERSION 2.8.12.2)
+cmake_minimum_required(VERSION 3.5)
 project(OpenCVPython CXX C)
 include("./standalone.cmake")
 

diff --git a/platforms/android/build-tests/test_cmake_build.py b/platforms/android/build-tests/test_cmake_build.py
index 25d185b8e5c69c4089e93cd365a38eb4e341c718..51affd1f3b4b02aadd3926fb011bd0d45634ccf1 100644 (file)
--- a/platforms/android/build-tests/test_cmake_build.py
+++ b/platforms/android/build-tests/test_cmake_build.py
@@ -7,7 +7,7 @@ import logging as log
 log.basicConfig(format='%(message)s', level=log.DEBUG)
 
 CMAKE_TEMPLATE='''\
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.5)
 
 # Enable C++11
 set(CMAKE_CXX_STANDARD 11)

diff --git a/samples/CMakeLists.example.in b/samples/CMakeLists.example.in
index 7cf20d5e44b3c2989b9f1c21d5ffd276c284ad69..59a133bc9d74b69b4f3755791c5d3e28513cb486 100644 (file)
--- a/samples/CMakeLists.example.in
+++ b/samples/CMakeLists.example.in
@@ -1,5 +1,5 @@
 # cmake needs this line
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.5)
 
 if(NOT DEFINED EXAMPLE_NAME)
   message(FATAL_ERROR "Invalid build script: missing EXAMPLE_NAME")

diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
index 6a18b61afa33417c7930c423b069c40e844a2915..dabe07747f819c16ee7d33bcc630c011621eaf0b 100644 (file)
--- a/samples/CMakeLists.txt
+++ b/samples/CMakeLists.txt
@@ -62,7 +62,7 @@ else()
 #  Standalone mode
 #
 #===================================================================================================
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.5)
 
 project(samples C CXX)
 option(BUILD_EXAMPLES "Build samples" ON)

diff --git a/samples/cpp/example_cmake/CMakeLists.txt b/samples/cpp/example_cmake/CMakeLists.txt
index 8d5cd98af291504c2a429b5c0f0cceaae2fe5e97..f17aca4b543201ecc32a3a3e4b43184c1decc4d2 100644 (file)
--- a/samples/cpp/example_cmake/CMakeLists.txt
+++ b/samples/cpp/example_cmake/CMakeLists.txt
@@ -1,5 +1,5 @@
 # cmake needs this line
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.5)
 
 # Define project name
 project(opencv_example_project)

diff --git a/samples/cpp/tutorial_code/gpu/gpu-thrust-interop/CMakeLists.txt b/samples/cpp/tutorial_code/gpu/gpu-thrust-interop/CMakeLists.txt
index 037d508569b3fd2f462d9dc705a3854351b4002e..1a35085aa2a6c67c80114dd9f64f47056a1c1532 100644 (file)
--- a/samples/cpp/tutorial_code/gpu/gpu-thrust-interop/CMakeLists.txt
+++ b/samples/cpp/tutorial_code/gpu/gpu-thrust-interop/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.5)
 
 FIND_PACKAGE(CUDA REQUIRED)
 INCLUDE_DIRECTORIES(${CUDA_INCLUDE_DIRS})

diff --git a/samples/hal/c_hal/CMakeLists.txt b/samples/hal/c_hal/CMakeLists.txt
index 8cf78aa5ff63b596ba8a0a81c4b5bef8933fd917..72dfef01c3ade27ddf537a43a33a83e5b172a77e 100644 (file)
--- a/samples/hal/c_hal/CMakeLists.txt
+++ b/samples/hal/c_hal/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.12.2 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
 
 set(PROJECT_NAME "c_hal")
 set(HAL_LIB_NAME "c_hal")

diff --git a/samples/hal/slow_hal/CMakeLists.txt b/samples/hal/slow_hal/CMakeLists.txt
index 1ffa4670b6ab7cca097196407bd26efc18d02177..a20596ea2a13a1d43dcd8fd5fc8a2c5bff304255 100644 (file)
--- a/samples/hal/slow_hal/CMakeLists.txt
+++ b/samples/hal/slow_hal/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.12.2 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
 
 set(PROJECT_NAME "slow_hal")
 set(HAL_LIB_NAME "slow_hal")

diff --git a/samples/openvx/CMakeLists.txt b/samples/openvx/CMakeLists.txt
index fd04e6b9e261e887238f4d21bc8fe8092871e758..c5efdf9ad02a428b2cbdc1afea371ad0369b046e 100644 (file)
--- a/samples/openvx/CMakeLists.txt
+++ b/samples/openvx/CMakeLists.txt
@@ -1,6 +1,6 @@
 ocv_install_example_src(cpp *.cpp *.hpp CMakeLists.txt)
 
-cmake_minimum_required(VERSION 2.8.12.2)
+cmake_minimum_required(VERSION 3.5)
 
 set(OPENCV_OPENVX_SAMPLE_REQUIRED_DEPS
   opencv_core